Several FTBFS fixes for Hurd systems.

Forwarded: no

Gbp-Pq: Name hurd.patch

diff --git a/makefile b/makefile
index c34b7716bc36be23a7b8d7f0ff681e48ea4f5e95..21637dadf0c14eae86cde196d0aaef845eccbb5d 100644 (file)
--- a/makefile
+++ b/makefile
@@ -227,6 +227,8 @@ GENIEOS := bsd
 else ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
 OS := freebsd
 GENIEOS := freebsd
+else ifeq ($(firstword $(filter GNU,$(UNAME))),GNU)
+OS := gnu
 else ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
 OS := netbsd
 GENIEOS := freebsd
@@ -1306,6 +1308,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
        $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
        $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
 
+.PHONY: gnu_x86
+gnu_x86: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
+       $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)32 precompile
+       $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)32
+
+.PHONY: gnu
+gnu: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
+       $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
+       $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
+
 #-------------------------------------------------
 # gmake-linux-clang
 #-------------------------------------------------

diff --git a/scripts/genie.lua b/scripts/genie.lua
index fa4a5bb6fa1652843896eb9b6c5e4befba3651f1..b0e6047a5f3eb9e4897f3ed822be9bcfcfd3c1c3 100644 (file)
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -150,6 +150,7 @@ newoption {
                { "netbsd",        "NetBSD"                 },
                { "openbsd",       "OpenBSD"                },
                { "linux",         "Linux"                  },
+               { "gnu",           "GNU"                    },
                { "macosx",        "OSX"                    },
                { "windows",       "Windows"                },
                { "haiku",         "Haiku"                  },

diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index a53b7fe858fbb02ac1b424a9a3f40c11e74aaac3..ed0d419becd6c70d2662dd0896412237ac767e33 100644 (file)
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -221,6 +221,9 @@ if _OPTIONS["targetos"]=="windows" then
        SDLOS_TARGETOS      = "win32"
 elseif _OPTIONS["targetos"]=="macosx" then
        SDLOS_TARGETOS      = "macosx"
+elseif _OPTIONS["targetos"]=="gnu" then
+       SDL_NETWORK         = "taptun"
+       SYNC_IMPLEMENTATION = "tc"
 end
 
 if BASE_TARGETOS=="unix" then

diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp
index f5dc2e91f10f3c3927682cd3270bf0d4e04cba35..533fa8712044f2d78ed4760e13c95706a5e97ede 100644 (file)
--- a/src/osd/modules/file/posixfile.cpp
+++ b/src/osd/modules/file/posixfile.cpp
@@ -42,6 +42,12 @@
 #define _DARWIN_C_SOURCE
 #endif
 
+#if defined(__GNU__)
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+#endif
+
 // MAME headers
 #include "posixfile.h"
 #include "osdcore.h"

diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
index 6dd35574faf6c8c41dd9cfacf7e92a1ab7edc306..48f1860a22b22b807045235e2cb5dd22b7333416 100644 (file)
--- a/src/osd/modules/file/posixptty.cpp
+++ b/src/osd/modules/file/posixptty.cpp
@@ -27,10 +27,18 @@
 #include <util.h>
 #elif defined(__linux__) || defined(__EMSCRIPTEN__)
 #include <pty.h>
+#elif defined(__GNU__)
+#include <pty.h>
+#include <termios.h>
 #elif defined(__HAIKU__)
 #include <bsd/pty.h>
 #endif
 
+#if defined(__GNU__)
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+#endif
 
 namespace {
 

diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index 13e6c260612f3bc76fa16512825cb6b618231cfd..86fe46ec37ff5fcb30c75f94986cc275ba1dde2b 100644 (file)
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -24,7 +24,7 @@
 
 #ifdef SDLMAME_UNIX
 
-#if defined(__linux__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
 #define SDLMAME_LINUX 1
 
 #elif defined(__FreeBSD__)